bitkeeper revision 1.1154 (4112b45dWwkFmdda2Kbef4LU3kxWcw)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Thu, 5 Aug 2004 22:27:41 +0000 (22:27 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Thu, 5 Aug 2004 22:27:41 +0000 (22:27 +0000)
commit82401cec24b43c83e64f5d3a8fe3ac34ca8ea288
tree9cdc3695ac91ba74d2a05212273fbddf9700781a
parent438b8fa221a8333ea7330e7a039bb316b05385c8
parentedd2be063485fb4ee02275eea8448ae461cc0b59
bitkeeper revision 1.1154 (4112b45dWwkFmdda2Kbef4LU3kxWcw)

Merge scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xeno
linux-2.6.7-xen-sparse/arch/xen/i386/kernel/setup.c
linux-2.6.7-xen-sparse/include/asm-xen/asm-i386/fixmap.h